Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Wed, 24 Apr 2013 19:12:03 +0000 (22:12 +0300)
committerEli Zaretskii <eliz@gnu.org>
Wed, 24 Apr 2013 19:12:03 +0000 (22:12 +0300)
commit708c8bcbf5e46a8a991563bd00a9c94f95a64324
treec81e61c69e7b6dd82392b132db462b86fc989402
parent319790b5aafd6fa7ff5c420a62ff552c0ceb2654
parentd22564c007cd12b6651a369fcb31b5b315019bbe
Merge from trunk.